ftfont.c (get_adstyle_property): Fix previous change (Bug#10233).

diff --git a/src/ChangeLog b/src/ChangeLog
index 3085cf429098a47b5124bd8931ef8a070273b6ed..b03b235586fda16f3102dd541f4e7f4860c1b964 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-08  Kenichi Handa  <handa@m17n.org>
+
+       * ftfont.c (get_adstyle_property): Fix previous change
+       (Bug#10233).
+
 2011-12-07  Juanma Barranquero  <lekktu@gmail.com>
 
        * w32.c (init_environment): If no_site_lisp, remove site-lisp

diff --git a/src/ftfont.c b/src/ftfont.c
index ec1a4ca6a78a5498f4df9aaf790310b82ec90036..bab97e44fabe28a6c5667e5159047bbc14c967e0 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -166,8 +166,8 @@ get_adstyle_property (FcPattern *p)
 
 #ifdef FC_FONTFORMAT
   if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch)
-      && (xstrcasecmp ((char *) fcstr, "bdf") != 0
-         || xstrcasecmp ((char *) fcstr, "pcf") != 0))
+      && xstrcasecmp ((char *) fcstr, "bdf") != 0
+      && xstrcasecmp ((char *) fcstr, "pcf") != 0)
     /* Not a BDF nor PCF font.  */
     return Qnil;
 #endif